Merge with xenppc-unstable-merge.hg.
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Wed, 30 Aug 2006 21:36:18 +0000 (22:36 +0100)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Wed, 30 Aug 2006 21:36:18 +0000 (22:36 +0100)
commit8a1ca3b97e518d0f3eb2f0f82f19da84351a5466
treec67f4ecff22fd70aaf3e7f973b58e79b65e3631e
parentbbf0ef949424c59fa9372be209fca7833cf60c58
parent1b4f247ac5b9bb8b5b61b002607543dd90d08704
Merge with xenppc-unstable-merge.hg.